Merge tag 'upstream/2_rc2+svn383' into experimental
authorDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Mon, 26 Mar 2012 14:33:52 +0000 (17:33 +0300)
committerDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Mon, 26 Mar 2012 14:33:52 +0000 (17:33 +0300)
commit4b1843b88ce6db2b2b93271c36d8b82759685b66
treecfd13392c819bdd81956a5e23625840087a615ea
parent96a3be999e6b3be5bdc65c079fa4100b80b5c680
parentca6fc9139b7d73000a0f89804a324fbff04cd41b
Merge tag 'upstream/2_rc2+svn383' into experimental

Upstream version 2~rc2+svn383